Adwaita: fix inline-toolbar backgrounds

This was lost in a recent cleanup.

diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 6b5e13993d741df218261ab05e722d8b9601ba5f..0c7cafad51f278d9d5689e050f6586fb286a2f83 100644 (file)
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -588,6 +588,27 @@ $_dot_color: if($variant=='light', $selected_bg_color,
   .linked.vertical &:backdrop { @extend %linked_vertical; }
 }
 
+// all the following is for the +|- buttons on inline toolbars, that way
+// should really be deprecated...
+.inline-toolbar GtkToolButton > .button { // redefining the button look is
+  // needed since those are flat...
+  @include button(normal);
+  &:hover { @include button(hover); }
+  &:active { @include button(active); }
+  &:checked{ @include button(active); }
+  &:insensitive { @include button(insensitive); }
+  &:insensitive:active { @include button(insensitive-active); }
+  &:insensitive:checked { @include button(insensitive-active); }
+  &:backdrop { @include button(backdrop); };
+  &:backdrop:active { @include button(backdrop-active); }
+  &:backdrop:checked { @include button(backdrop-active); }
+  &:backdrop:insensitive { @include button(backdrop-insensitive); }
+  &:backdrop:insensitive:active {
+  @include button(backdrop-insensitive-active); }
+  &:backdrop:insensitive:checked {
+  @include button(backdrop-insensitive-active); }
+}
+
 // More inline toolbar buttons
 .inline-toolbar.toolbar GtkToolButton,
 .inline-toolbar.toolbar GtkToolButton:backdrop {

diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index 170d2bf859fb3e214d1378b2cb276c8073c466f0..5af4c3455162350914d7ed6ee08d66f69197f40b 100644 (file)
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -861,6 +861,106 @@ GtkCalendar.header .button.titlebutton {
   GtkCalendar.header .primary-toolbar .button.titlebutton {
     icon-shadow: none; }
 
+.inline-toolbar GtkToolButton > .button, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton > .button.titlebutton,
+.inline-toolbar .titlebar GtkToolButton > .button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton > .button.titlebutton,
+.inline-toolbar GtkCalendar.header GtkToolButton > .button.titlebutton,
+GtkCalendar.header .inline-toolbar GtkToolButton > .button.titlebutton {
+  color: #eeeeec;
+  outline-color: rgba(238, 238, 236, 0.3);
+  border-color: #1c1f1f;
+  background-image: linear-gradient(to bottom, #454c4c, #393f3f 40%, #2d3232);
+  text-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
+  icon-shadow: 0 -1px rgba(0, 0, 0, 0.81176);
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
+  .inline-toolbar GtkToolButton > .button:hover {
+    color: #eeeeec;
+    outline-color: rgba(238, 238, 236, 0.3);
+    border-color: #1c1f1f;
+    background-image: linear-gradient(to bottom, #5b6464, #434a4a 40%, #393f3f);
+    text-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
+    icon-shadow: 0 -1px rgba(0, 0, 0, 0.77976);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1), 0 1px rgba(238, 238, 236, 0.1); }
+  .inline-toolbar GtkToolButton > .button:active {
+    color: #eeeeec;
+    outline-color: rgba(238, 238, 236, 0.3);
+    border-color: #1c1f1f;
+    background-image: linear-gradient(to bottom, #232727, #2d3232);
+    text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
+    icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
+    box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0.1); }
+  .inline-toolbar GtkToolButton > .button:checked {
+    color: #eeeeec;
+    outline-color: rgba(238, 238, 236, 0.3);
+    border-color: #1c1f1f;
+    background-image: linear-gradient(to bottom, #232727, #2d3232);
+    text-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
+    icon-shadow: 0 -1px rgba(0, 0, 0, 0.89176);
+    box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px rgba(238, 238, 236, 0.1); }
+  .inline-toolbar GtkToolButton > .button:insensitive {
+    color: #939695;
+    border-color: #1c1f1f;
+    background-image: linear-gradient(to bottom, #323636);
+    text-shadow: none;
+    icon-shadow: none;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
+    .inline-toolbar GtkToolButton > .button:insensitive > GtkLabel {
+      color: inherit; }
+  .inline-toolbar GtkToolButton > .button:insensitive:active {
+    color: #939695;
+    border-color: #1c1f1f;
+    background-image: linear-gradient(to bottom, #2f3333, #323636);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
+    .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel {
+      color: inherit; }
+  .inline-toolbar GtkToolButton > .button:insensitive:checked {
+    color: #939695;
+    border-color: #1c1f1f;
+    background-image: linear-gradient(to bottom, #2f3333, #323636);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0.1); }
+    .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel {
+      color: inherit; }
+  .inline-toolbar GtkToolButton > .button:backdrop {
+    color: #c9cbc9;
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #393f3f);
+    text-shadow: none;
+    icon-shadow: none;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
+  .inline-toolbar GtkToolButton > .button:backdrop:active {
+    color: #c9cbc9;
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #2f3434);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
+  .inline-toolbar GtkToolButton > .button:backdrop:checked {
+    color: #c9cbc9;
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #2f3434);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
+  .inline-toolbar GtkToolButton > .button:backdrop:insensitive {
+    color: #5d6767;
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #323636);
+    text-shadow: none;
+    icon-shadow: none;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
+    .inline-toolbar GtkToolButton > .button:backdrop:insensitive > GtkLabel {
+      color: inherit; }
+  .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active {
+    color: #5d6767;
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #262929);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
+    .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active > GtkLabel {
+      color: inherit; }
+  .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked {
+    color: #5d6767;
+    border-color: #1e2222;
+    background-image: linear-gradient(to bottom, #262929);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(238, 238, 236, 0); }
+    .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked > GtkLabel {
+      color: inherit; }
+
 .inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat, .inline-toolbar.location-bar GtkToolButton > .button.flat, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton > .button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton > .button.titlebutton,
@@ -4064,3 +4164,5 @@ GtkCalendar.header .menuitem.titlebutton.button:selected, .list-row:selected {
 @define-color wm_button_active_color_b shade(#393f3f, 0.89);
 @define-color wm_button_active_color_c shade(#393f3f, 0.9);
 @define-color content_view_bg #292929;
+
+/*# sourceMappingURL=gtk-contained-dark.css.map */

diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index 9ccc41b3d51e830e70addded94ca08192d9a2f4a..2361e331ba37b9f7da8b4578e41d9be65e340565 100644 (file)
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -853,6 +853,106 @@ GtkCalendar.header .button.titlebutton {
   GtkCalendar.header .primary-toolbar .button.titlebutton {
     icon-shadow: none; }
 
+.inline-toolbar GtkToolButton > .button, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton > .button.titlebutton,
+.inline-toolbar .titlebar GtkToolButton > .button.titlebutton,
+.titlebar .inline-toolbar GtkToolButton > .button.titlebutton,
+.inline-toolbar GtkCalendar.header GtkToolButton > .button.titlebutton,
+GtkCalendar.header .inline-toolbar GtkToolButton > .button.titlebutton {
+  color: #2e3436;
+  outline-color: rgba(46, 52, 54, 0.3);
+  border-color: #a1a1a1;
+  background-image: linear-gradient(to bottom, #fafafa, #ededed 40%, #e0e0e0);
+  text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
+  icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
+  box-shadow: inset 0 1px white, 0 1px white; }
+  .inline-toolbar GtkToolButton > .button:hover {
+    color: #2e3436;
+    outline-color: rgba(46, 52, 54, 0.3);
+    border-color: #a1a1a1;
+    background-image: linear-gradient(to bottom, white, #f7f7f7 40%, #ededed);
+    text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
+    icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
+    box-shadow: inset 0 1px white, 0 1px white; }
+  .inline-toolbar GtkToolButton > .button:active {
+    color: #2e3436;
+    outline-color: rgba(46, 52, 54, 0.3);
+    border-color: #a1a1a1;
+    background-image: linear-gradient(to bottom, #d6d6d6, #e0e0e0);
+    text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
+    icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
+    box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white; }
+  .inline-toolbar GtkToolButton > .button:checked {
+    color: #2e3436;
+    outline-color: rgba(46, 52, 54, 0.3);
+    border-color: #a1a1a1;
+    background-image: linear-gradient(to bottom, #d6d6d6, #e0e0e0);
+    text-shadow: 0 1px rgba(255, 255, 255, 0.76923);
+    icon-shadow: 0 1px rgba(255, 255, 255, 0.76923);
+    box-shadow: inset 0 1px rgba(0, 0, 0, 0.07), inset 0 2px 1px -2px rgba(0, 0, 0, 0.6), 0 1px white; }
+  .inline-toolbar GtkToolButton > .button:insensitive {
+    color: #8d9091;
+    border-color: #a1a1a1;
+    background-image: linear-gradient(to bottom, #f4f4f4);
+    text-shadow: none;
+    icon-shadow: none;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
+    .inline-toolbar GtkToolButton > .button:insensitive > GtkLabel {
+      color: inherit; }
+  .inline-toolbar GtkToolButton > .button:insensitive:active {
+    color: #8d9091;
+    border-color: #a1a1a1;
+    background-image: linear-gradient(to bottom, #ebebeb, #f4f4f4);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
+    .inline-toolbar GtkToolButton > .button:insensitive:active > GtkLabel {
+      color: inherit; }
+  .inline-toolbar GtkToolButton > .button:insensitive:checked {
+    color: #8d9091;
+    border-color: #a1a1a1;
+    background-image: linear-gradient(to bottom, #ebebeb, #f4f4f4);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px white; }
+    .inline-toolbar GtkToolButton > .button:insensitive:checked > GtkLabel {
+      color: inherit; }
+  .inline-toolbar GtkToolButton > .button:backdrop {
+    color: #54595a;
+    border-color: #a8a8a8;
+    background-image: linear-gradient(to bottom, #ededed);
+    text-shadow: none;
+    icon-shadow: none;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+  .inline-toolbar GtkToolButton > .button:backdrop:active {
+    color: #54595a;
+    border-color: #a8a8a8;
+    background-image: linear-gradient(to bottom, #d4d4d4);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+  .inline-toolbar GtkToolButton > .button:backdrop:checked {
+    color: #54595a;
+    border-color: #a8a8a8;
+    background-image: linear-gradient(to bottom, #d4d4d4);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+  .inline-toolbar GtkToolButton > .button:backdrop:insensitive {
+    color: #c7c7c7;
+    border-color: #a8a8a8;
+    background-image: linear-gradient(to bottom, #f4f4f4);
+    text-shadow: none;
+    icon-shadow: none;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+    .inline-toolbar GtkToolButton > .button:backdrop:insensitive > GtkLabel {
+      color: inherit; }
+  .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active {
+    color: #c7c7c7;
+    border-color: #a8a8a8;
+    background-image: linear-gradient(to bottom, #e7e7e7);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+    .inline-toolbar GtkToolButton > .button:backdrop:insensitive:active > GtkLabel {
+      color: inherit; }
+  .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked {
+    color: #c7c7c7;
+    border-color: #a8a8a8;
+    background-image: linear-gradient(to bottom, #e7e7e7);
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0); }
+    .inline-toolbar GtkToolButton > .button:backdrop:insensitive:checked > GtkLabel {
+      color: inherit; }
+
 .inline-toolbar.toolbar GtkToolButton > .button.flat, .inline-toolbar GtkToolButton > .button.flat, .inline-toolbar.search-bar GtkToolButton > .button.flat, .inline-toolbar.location-bar GtkToolButton > .button.flat, .inline-toolbar .header-bar GtkToolButton > .button.titlebutton, .header-bar .inline-toolbar GtkToolButton > .button.titlebutton,
 .inline-toolbar .titlebar GtkToolButton > .button.titlebutton,
 .titlebar .inline-toolbar GtkToolButton > .button.titlebutton,
@@ -4212,3 +4312,5 @@ GtkCalendar.header .menuitem.titlebutton.button:selected, .list-row:selected {
 @define-color wm_button_active_color_b shade(#ededed, 0.89);
 @define-color wm_button_active_color_c shade(#ededed, 0.9);
 @define-color content_view_bg #ffffff;
+
+/*# sourceMappingURL=gtk-contained.css.map */